Merge changes from topic "presubmit-am-bbf213f141924072ae886cc03356ffb5" into sc-dev-plus-aosp am: 4643773c3e

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

Change-Id: Idf3496094c8fbd668893b95702a9480d64932fc8