Merge changes from topic "presubmit-am-22095588cfca4cccb6de704ccd95f743" into sc-dev-plus-aosp am: c563fcfa am: 048813ad

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

Change-Id: Ifa8636afb75520a45a0fcb924c585fdf00595bff