Merge "Improve first opaque activity candidate detection" into tm-qpr-dev am: 8f8baa74

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



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