[automerger skipped] Improve first opaque activity candidate detection am:...

[automerger skipped] Improve first opaque activity candidate detection am: bcf680d0 -s ours am: c32264da -s ours am: d63acb9f -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: Iea6f8081e4e41f48715b54883711c68ef3f27af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>