[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: 2610f618 -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: I6cfb772f67827c1b11a9647fb8b7338ea17755cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>