Merge "Fix translation reference gone problem." into sc-dev am: 3d088cbb am: da14b09d am: fdd91c15

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

Change-Id: Iefe97dc8e4949a57d9ac15f31fdeb3e47c022106