Merge changes from topic "presubmit-am-5ca17d44b35a4027812e4d3ec04478c2" into...

Merge changes from topic "presubmit-am-5ca17d44b35a4027812e4d3ec04478c2" into sc-v2-dev-plus-aosp am: d19d1f01 am: 1b4900a5

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

Change-Id: I1c6b6ea6f85e414fa414f6ea4f8c670c2052ab83