[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "fixAudioAidlVersions-tm-dev-plus-aosp" into tm-dev-plus-aosp am: 71052c75 am: a4735bf9 am: 8b794e6a -s ours

am skip reason: Merged-In If5a96c05b6448b588aa6326225dc6962ca7da6c7 with SHA-1 56ec5d9e is already in history

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



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