Merge "Don't reset translation callback with other state" into tm-qpr-dev am:...

Merge "Don't reset translation callback with other state" into tm-qpr-dev am: 1eaf0fad am: 017c4aa3

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



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