Merge "Merge "Return right activities in getTopVisibleActivities method" into...

Merge "Merge "Return right activities in getTopVisibleActivities method" into udc-dev am: d401d88f am: 107a0e61" into udc-qpr-dev am: 080be7b5

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



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