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

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

am skip reason: subject contains skip directive

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



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