Merge changes from topic "presubmit-am-6d4d7bb3111b4f5383b363bed04ca2ae" into...

Merge changes from topic "presubmit-am-6d4d7bb3111b4f5383b363bed04ca2ae" into sc-dev-plus-aosp am: 18f14d1d am: 487627fa am: 501321b6

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

Change-Id: Id0ee9cd1290e22ebb45f155aaad4130784baa476