[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-a857ce8919bc4bb7802485a10b458590" into sc-v2-dev-plus-aosp am: fe4b824b -s ours am: 8f93c532 -s ours

am skip reason: Merged-In I7649b4f22b74647d152d76bb46d5ca70bfa3617d with SHA-1 a4131c50 is already in history

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



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