Merge changes from topic "presubmit-am-1bbd0f65340f4740a2eb6e4b49c5bdca" into...

Merge changes from topic "presubmit-am-1bbd0f65340f4740a2eb6e4b49c5bdca" into sc-dev-plus-aosp am: 34c94467 am: a7077216 am: 30a3a803

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

Change-Id: I10310d07e5f4b6dd72588e30adfc60c3629e0c4e