Merge "Fix locale bug for string conversions" into tm-qpr-dev am: aa6e5978

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



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