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

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



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