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

Merge changes from topic "presubmit-am-ea4f4574a23a46d2955c3fdbdc2b1120" into sc-v2-dev-plus-aosp am: 5531f47f am: a58cb80e

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



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