Merge changes from topic "b200851199" into sc-qpr1-dev am: 250448c0bc

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

Change-Id: Icaa01be38637089e703e322e083a52a97dddd771