Merge changes from topic "presubmit-am-5f95fe6e5a284ed0b7c60c57bf8c4a20" into sc-dev-plus-aosp am: b701023f am: eba45064 am: 867eafaf

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

Change-Id: I68f4b64fd2aa666021fa75d565cb92cb0719e622