Merge changes from topic "presubmit-am-58188ae3ac814c1f9143426693ab3d03" into...

Merge changes from topic "presubmit-am-58188ae3ac814c1f9143426693ab3d03" into sc-v2-dev-plus-aosp am: d22eaf68 am: d5756b1b am: b010d1d3

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

Change-Id: Ib7b19e83955c1bff30c81889dfa08a80397e73f8