Merge "AudioFormat: Add ENCODING_AC4_L4" into main am: adb78e3974 am: f7859a7313

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

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