Merge changes from topic "am-f59bc3a9eadc454c90d1fe591e2f62cf" into...

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

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

Change-Id: I10b63577626f4bf7a83444e9236e17da2983a9ea