[automerger skipped] Merge changes from topic "bug_237766679_sc" into...

[automerger skipped] Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev am: 1b9028d0 am: 673ddf61 am: b41a54fd am: c762b28c am: b9dae857 am: 889de9f4 -s ours

am skip reason: Merged-In Ia08f225c21a3933067d066a578ea4af9c23e7d4c with SHA-1 c6e73437 is already in history

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



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