[automerger skipped] Improve first opaque activity candidate detection am: bcf680d0 -s ours

am skip reason: Merged-In I62e829555c43136080ee4909f7dcf8c388165e9f with SHA-1 63ce4e5f is already in history

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



Change-Id: I34f5312a0b6061712cfae2d3987af5255f3ff9c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>