[automerger skipped] Merge "Use AudioDeviceTypeAddrVector instead of Vector<AudioDeviceTypeAddr>" am: 8fe2d292b0 am: 1cc2a1f6ef am: 7c9599f917 -s ours

am skip reason: Change-Id Ib48056d6c332ae5eb006e0e12a80c8505c7313d8 with SHA-1 0b5532967d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60d4c7cea8e47da4da0852f951bb11070452762c