Commit f2b5cf27 authored Apr 08, 2022 by Bill Yi Committed by Automerger Merge Worker Apr 08, 2022

[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 95267eaf -s ours

am skip reason: Merged-In Iae1a66165221f45051be17c4d047b5bd5be3999b with SHA-1 c7fda7b5 is already in history

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

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

There are no changes