Merge changes from topic "am-3042e3015d3e426bb634b7edde5421e6" into...

Merge changes from topic "am-3042e3015d3e426bb634b7edde5421e6" into sc-qpr1-dev-plus-aosp am: b1f2c8e8 am: 7064adb1

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

Change-Id: I66d8826313a4c4e904f3d5f0ab6c2cd3a74a664d