Merge changes from topic "b200851199" into sc-qpr1-dev am: 250448c0 am: 7cd10974

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

Change-Id: Ie5393d91eff5e54551dbcacb7293e4f05f3da8e6