Merge changes from topic "presubmit-am-0adaeb1d15a7491689c8c569dbba8db2" into sc-mainline-prod am: 07a9639d

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

Change-Id: I64072193c24d95b2b710fbcaf405b9493bad37eb