Merge "Finishing the visible requested activity vs. destroying it" into...

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

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



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