[automerger skipped] Revert "DO NOT MERGE Revert "Fix activity leak bug"" am:...

[automerger skipped] Revert "DO NOT MERGE Revert "Fix activity leak bug"" am: b9ed0939 am: 8aa4c1e0 -s ours

am skip reason: subject contains skip directive

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



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