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 am: 5928ed5f am: 19936c94

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



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