[automerger skipped] Merge "Remove active translation on Activity destroyed"...

[automerger skipped] Merge "Remove active translation on Activity destroyed" into tm-qpr-dev am: 9c185693 am: c1ec30e7 -s ours

am skip reason: Merged-In If1881fd4588725021d38e5b9336c3e69bca17039 with SHA-1 ee46d18d is already in history

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



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