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

tools/aosp/aosp_sha.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 LOCAL_DIR="$( dirname "${BASH_SOURCE}" )"
 
-if git branch -vv | grep -q -E "^\*[^\[]+\[aosp/"; then
+if git log -n 1 --format='%D' HEAD@{upstream} | grep -q aosp/; then
     # Change appears to be in AOSP
     exit 0
 elif git log -n 1 --format='%B' $1 | grep -q -E "^Ignore-AOSP-First: .+" ; then