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

Merge changes from topic "presubmit-am-dd66ff18611c4485a6fbaf654c25ab86" into sc-v2-dev-plus-aosp am: 92ef68de am: b572cab9

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



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