Merge changes from topic "bug_237766679_sc" into sc-qpr1-dev am: 1b9028d0dd am: 673ddf6188 am: b41a54fdc3
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>
This commit is contained in: