[automerger skipped] Merge "AAudio should not use legacy path if not allowed" am: 07b09a7969 am: 9a1d648e77
am: c0b9c68efc  -s ours

Change-Id: I4b63adea462bb31cb326b5057a6afe4839656839