Merge changes from topic "presubmit-am-9e239470faa64ffd8902a892e6f1ea47" into...

Merge changes from topic "presubmit-am-9e239470faa64ffd8902a892e6f1ea47" into sc-dev-plus-aosp am: aff179b0 am: 1903d2b7 am: fe3b1647

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

Change-Id: Ibc44c30906bcacaead3f80e2be4d075ccf118b58