[automerger skipped] Merge "Merge...

[automerger skipped] Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: 8fb8921a -s ours am: 085d433a -s ours am: 289974b1 -s ours

am skip reason: Merged-In I13199bc39e9445929195f3d15579cbffe94e92b0 with SHA-1 0f473ac7 is already in history

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

Change-Id: Ieea0d6d46746b6c899bc8d1c5dcc91192973457b