[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L35800000963116081:N91200001406548621" into udc-qpr-dev am: 77c5cd9a am: 83bec07c -s ours

am skip reason: Merged-In I90391f411d84ec5c749bb4d8cdefd7e610539e6e with SHA-1 515a1625 is already in history

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



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