Merge changes from topic "presubmit-am-5f95fe6e5a284ed0b7c60c57bf8c4a20" into sc-dev-plus-aosp am: b701023fc0

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

Change-Id: I2be82a25a53e3b3e641b7c64c839bf321d1a2a0c