Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dba8d2eeb4
-s ours am: 5b84d06935
-s ours" into rvc-qpr-dev-plus-aosp am: dba49a339c
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12403756 Change-Id: I82c02e437baceaab084d5b13ac97849d7d5e8a7e
This commit is contained in: