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

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



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