[automerger skipped] Merge "Improve first opaque activity candidate detection"...

[automerger skipped] Merge "Improve first opaque activity candidate detection" into tm-qpr-dev am: 8f8baa74 am: bb5142be -s ours am: 10f20ac5 -s ours am: 6dc711ac -s ours

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

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



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