Merge changes from topic "am-f59bc3a9eadc454c90d1fe591e2f62cf" into sc-qpr1-dev-plus-aosp am: 911a73be

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

Change-Id: If702223d8ae657b6e628ca969b127e58cd54f41e