Merge changes from topic "presubmit-am-bb4a824ed94f498799af04d5ca2829b8" into...

Merge changes from topic "presubmit-am-bb4a824ed94f498799af04d5ca2829b8" into sc-dev-plus-aosp am: cdf9d99a am: 36dd0e93

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

Change-Id: I8692a0e4a730e9a958be327b47641db7703600a7