Merge "Improve first opaque activity candidate detection" into udc-dev am:...

Merge "Improve first opaque activity candidate detection" into udc-dev am: 3d8f1668 am: 9f6a2c6d

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



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