Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 75cb80445b -s ours" into rvc-d1-dev-plus-aosp am: bc603d40a7 -s ours am: 44eb11cd71 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11900658 Change-Id: I7c08536f0cad83c1f3386037c5df701a7398d47f
This commit is contained in: