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: 4c04a205

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



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