Merge "Merge changes from topic "b200851199" into sc-qpr1-dev am: 250448c0 am: 4ec2eb53" into sc-v2-dev-plus-aosp am: ace5eb66

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

Change-Id: Ib9969e45f075c36e6c7029a5b97d9d55751db767