[automerger skipped] Merge changes from topic "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd" into sc-qpr1-dev am: 96a5a3b9 am: 628a5536 -s ours am: 73e2c9a4 -s ours am: 4dd193c9 -s ours am: fdfd2846 -s ours am: 87feee9f -s ours

am skip reason: Merged-In Ib34c0b56ef52f5ee2deceb84b02cd0ff73d8181d with SHA-1 530407c9 is already in history

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



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