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

Merge changes from topic "presubmit-am-8fce4e975b58476c9f42996d277b3173" into sc-dev-plus-aosp am: 7a3563b9 am: d75ec2d0 am: 46d10a55

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

Change-Id: Iffb97dafce26e602c5815f7eb0bae9ff2bd4e919