[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: 471cb6fd -s ours

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

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



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