Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE"...

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 679e91ac -s ours am: 3b8b039f -s ours" into sc-v2-dev-plus-aosp am: 21ae1256 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia3d64dba9875b82975ff62216105e1085482669a