[automerger skipped] Merge changes from topic "cherrypicker-L38900000962607726:N28500001397100516" into udc-qpr-dev am: 97c11a93 am: 94be9659 -s ours

am skip reason: Merged-In Iaaa3b68c5f4c60dde7a4ae45c1dc2b0784cbcdb6 with SHA-1 1c35b549 is already in history

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



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