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

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

Change-Id: Icc499bdc06ab7e325b8a1ddf71e2a5e402c0dfa4