Merge "Ensure the above-top finishing activity is invisible" into tm-qpr-dev am: 41f50d35

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



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