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

[automerger skipped] DO NOT MERGE Revert "Fix activity leak bug" am: c199efbe am: f8539798 -s ours

am skip reason: subject contains skip directive

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



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