[automerger skipped] Merge "DO NOT MERGE Revert "Fix activity leak bug"" into...

[automerger skipped] Merge "DO NOT MERGE Revert "Fix activity leak bug"" into tm-qpr-dev am: 9ff21630 am: eb9a11a5 -s ours

am skip reason: subject contains skip directive

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



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