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

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4c916d0b -s ours am: 6af0d99a -s ours am: 24840903 -s ours am: e5d1d8db -s ours" into udc-qpr-dev-plus-aosp am: a146afe4 -s ours

am skip reason: subject contains skip directive

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



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