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

Merge "Fix translation reference gone problem." into sc-dev am: 3d088cbb am: 4636f69a am: a3d58fa1

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

Change-Id: I6eb8ac05c68cda2d62ddf14325dfc2fd7bcaca60