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

Merge changes from topic "presubmit-am-a0f887f302784f8c86331d3e0819fa21" into sc-dev-plus-aosp am: 7997bb56 am: 13b80c44

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

Change-Id: Id3b97af2a0938b4ef6311559f7fa0c504fc18740