Merge changes from topic "presubmit-am-bb4a824ed94f498799af04d5ca2829b8" into sc-dev-plus-aosp am: cdf9d99af3

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

Change-Id: Ic694e0ba10537e2332a9acf76358d9d0a7e98f78