[automerger skipped] Merge "libaudiohal@aidl: fix the encoder padding and...

[automerger skipped] Merge "libaudiohal@aidl: fix the encoder padding and delay ranges" into udc-qpr-dev am: 8bb76cf2 -s ours

am skip reason: Merged-In I33f60a4710466c7c28a07fd1ad51a150a3bc69d6 with SHA-1 f753e68e is already in history

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



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