[automerger skipped] Merge "Fix activity leak bug" into tm-qpr-dev am: 020d3fa7 am: 359453d8 -s ours

am skip reason: Merged-In I7dfebac90aa43f89433f49e0ed60b3ff57bcc497 with SHA-1 4873e34e is already in history

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



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