[automerger skipped] Merge "Add PS5 controller PID to Alsa manager block...

[automerger skipped] Merge "Add PS5 controller PID to Alsa manager block list." into udc-dev am: ed6ae54c am: 283556a0 -s ours am: 13431c52 -s ours

am skip reason: Merged-In Ieb626512bc18dbf4cc84bb104eb4fd9cba342b60 with SHA-1 d6b2ae28 is already in history

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



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