Merge "Handle NLS metadata when provided as strings" into sc-dev am: 333b68d059
am: 9936e10d1e
am: aef5f6adce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14470497 Change-Id: I595e0cd87c2cfc6a744aa274691a2b003178993e
This commit is contained in: