Merge changes from topic "presubmit-am-6d4d7bb3111b4f5383b363bed04ca2ae" into sc-mainline-prod am: 431f89d6

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

Change-Id: Ibdcc35c4dcc2664d7dd270175fde5ed0b22b4c75