[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-bcabb9dd98ca4156b5b18dd3d210a081" into tm-qpr-dev-plus-aosp am: 4ccfe64d -s ours am: d4a28562 -s ours am: ed40cb00 -s ours

am skip reason: Merged-In I838ff0e125acadabc8436a00dbff707cc4be6249 with SHA-1 4d10ae5a is already in history

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



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