Merge changes from topic "fix-b-205884982-use-aidl-config" am: e8c2d94de9 am: 2c4afa5ca7 am: 956d53da2f am: 2f68c404c2 am: 7af1e095d5 am: c712e0bcd9

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

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