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

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

Change-Id: I4d5c396c36a35b63a32279893b5ea0b22809f7af