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

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

Change-Id: Ib822211f2e7cbc4cac831897d87ea8af8697142a