Merge "Don't clear translation state on temporary detachment." into tm-dev am:...

Merge "Don't clear translation state on temporary detachment." into tm-dev am: 76ba87f9 am: 29e91d3a

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



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