Merge "Merge "Don't clear translation state on temporary detachment." into tm-dev am: 76ba87f9 am: 4c04a205" into tm-d1-dev-plus-aosp am: a66505b5

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



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