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

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



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