Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev am: 1b9028d0...

Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev am: 1b9028d0 am: 673ddf61 am: b41a54fd

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



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