Merge changes from topic "presubmit-am-bb75d6f3506a458090c2169c1e656124" into...

Merge changes from topic "presubmit-am-bb75d6f3506a458090c2169c1e656124" into sc-v2-dev-plus-aosp am: d04edc7a am: bebe3684

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



Change-Id: I77040c687bcc41b237a61003ccf897854e66da5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>