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 am: 5598a269

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



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