[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f961ac7c...

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f961ac7c -s ours am: 11d7942c -s ours am: 4cf13fea -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ifa028b918f73122b908ce32b071aa2391795984f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>