Merge "Improve how "likely an AOSP change" is detected" am: 0b0c098d36 am: 17ac2e2d80

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1948796

Change-Id: I564a443788f94a01c452b9a68d0317bd799ca0a9