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

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



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