[automerger skipped] Merge "Use AudioDeviceTypeAddrVector instead of Vector<AudioDeviceTypeAddr>" am: 31bdb51946 am: 7fe4bf069f am: d7bbbd501c -s ours

am skip reason: Change-Id Ibcd91fcba95c53e3c172ae62fc6f30e70509de51 with SHA-1 6a02d53b76 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I019ca40a91dd357fe534c33028feae0c47aa2558