Merge changes from topic "presubmit-am-011ce531f02142789237cf1ddf277b47" into sc-dev-plus-aosp am: 913d290071 am: 87f4c7f76e

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

Change-Id: Iced2ae6c671d47b05e4c9306666ea027d7b5cacc