[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-a343453321d44979adac9c26fc738eab" into udc-qpr-dev am: 5d8b8af3 -s ours am: ebb5e07e -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 39f57376 is already in history

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



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