Merge "DO NOT MERGE Revert "Fix activity leak bug"" into tm-qpr-dev am: 9ff21630

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



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