Merge changes from topic "presubmit-am-821d6efded8a499dbc4f84363a0f60f9" into sc-dev-plus-aosp am: d5e77485 am: a41cc3da

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

Change-Id: Ic39300778a03e47edc5720f1634e7e73ef022f3b