Merge "Fix translation session id collision bug." into tm-qpr-dev am: ebb357e1 am: 1551aae8

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



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