Merge changes from topic "presubmit-am-5f95fe6e5a284ed0b7c60c57bf8c4a20" into...

Merge changes from topic "presubmit-am-5f95fe6e5a284ed0b7c60c57bf8c4a20" into sc-dev-plus-aosp am: b701023f am: eba45064

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

Change-Id: Ida86253f98507dba8263b021a953391ec2b2d428