Merge changes from topic "presubmit-am-8fce4e975b58476c9f42996d277b3173" into...

Merge changes from topic "presubmit-am-8fce4e975b58476c9f42996d277b3173" into sc-mainline-prod am: 6a11c0cc

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

Change-Id: I04d950624841c34f4e93b9439fde191d7a287960