Merge changes from topic "presubmit-am-77a112383a4743c3a21b2621a549dd36" into...

Merge changes from topic "presubmit-am-77a112383a4743c3a21b2621a549dd36" into sc-v2-dev-plus-aosp am: 3f86aa49 am: fe3883d3

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

Change-Id: I6cb324b2dbf5405769a29b8d18b0f05a583e3de8