Merge changes from topic "presubmit-am-821d6efded8a499dbc4f84363a0f60f9" into sc-mainline-prod am: 9042d8b9

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

Change-Id: Iff7e476a4a73b7fdb8d15968a8ca3a22bb6718bd