Merge changes from topic "fix-b-205884982-use-aidl-config" am: e8c2d94d am:...

Merge changes from topic "fix-b-205884982-use-aidl-config" am: e8c2d94d am: 2c4afa5c am: 956d53da am: 2f68c404 am: 7af1e095

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



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