Merge "[conflict] Merge changes from topic...

Merge "[conflict] Merge changes from topic "presubmit-am-f474a3dff5ca458a90dc89a6dc7b03f7" into sc-v2-dev-plus-aosp am: 0932ef92" into tm-dev am: 9825a592

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

Change-Id: I93622fc1c223f9cdcc83f5d99830079ae4c30e9f