Merge "Finishing the visible requested activity vs. destroying it" into tm-qpr-dev am: ff91f4ef

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



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