[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dffeffb640 -s ours am: 9592b727fa -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15067632 Change-Id: Ifab1c1e17ad4d7210c46e813fa7a761efdfe6956
This commit is contained in: