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

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

Change-Id: I9bb2b5a78e12a01422e113d9498cac394f7cba06