[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-80091bc2e6654d6d850a978ebe80e880" into tm-qpr-dev-plus-aosp am: 18393dd8 -s ours am: 95e2784d -s ours am: 308e67dd -s ours

am skip reason: Merged-In Ic7b1c4b40960fd04de9efbf4f6d7abee45c93025 with SHA-1 b828087b is already in history

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



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