[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-ac1fefcfb8ff4afa9a12b9c99a31f5fa" into sc-v2-dev-plus-aosp am: f3c6b564 -s ours am: 91d94eab -s ours

am skip reason: Merged-In Ie8d5d008141e69febe5216f49b127222d2bcb8cc with SHA-1 8ea87a68 is already in history

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



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