Merge changes from topic "presubmit-am-d1c37f7c8ffe48118be3df49e87a3a61" into...

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

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

Change-Id: I834ff4e17f850fc457769ad85ba33097f10d59e2