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

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

Change-Id: Ibfc755f0d745ed056eedc36b586ee36b595c077e