[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 6b26007931 -s ours am: 9f3c1103c4 -s ours

am skip reason: Merged-In I00ca36e7ec8eea08f4b7ec6808a83c845dfc09ce with SHA-1 6cd39dfe5d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2058988

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