[automerger skipped] Merge "Merge 10952656" into aosp-main-future am:...

[automerger skipped] Merge "Merge 10952656" into aosp-main-future am: 37b59a00 -s ours am: 58ea3c94 -s ours

am skip reason: Merged-In I0a7233e0124a8c4defac51baa1a001fdbefeb4eb with SHA-1 63ca34ef is already in history

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



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