tree aac6275d39dc270382dd67bc80e9a74aedfc8ba5
parent 02c3da84181aa7187024dbda6721df33e81f4bc3
parent e42c779e4f59e6762645a2530be42e5b171d4471
author Bill Yi <byi@google.com> 1649447215 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649447215 +0000

[automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: bbe0c62d66 -s ours am: 32910d0da9 -s ours am: e42c779e4f -s ours

am skip reason: subject contains skip directive

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

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