Merge changes from topic "presubmit-am-d1c37f7c8ffe48118be3df49e87a3a61" into sc-qpr1-dev am: 32989077 am: dbf025f6 am: 545caab1

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

Change-Id: I00beeebd193209988014463214cf25c741ab5158