am bf99d8c3: am 895de04e: am fa198473: Merge "Add AudioAttributes to stream type conversion" into lmp-dev
am bf99d8c3: am 895de04e: am fa198473: Merge "Add AudioAttributes to stream type conversion" into lmp-dev

* commit 'bf99d8c31160cf61a25371759068592461cbc71a':
  Add AudioAttributes to stream type conversion

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base