Merge changes from topic "presubmit-am-61e6241521da4f04b2fb70ebbb6c35ae" into...

Merge changes from topic "presubmit-am-61e6241521da4f04b2fb70ebbb6c35ae" into sc-dev-plus-aosp am: e57ee53f

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

Change-Id: I6a37f28ee0349a696f5b5dde50563f65a2a9e4b8