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

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

Change-Id: Ib4e8b55d86d5b82f7ac6e939faad44144c424941