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 am: c762b28c

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



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