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

* commit 'fa19847302d7ecc5cf0e3342852ff40945acf309':
  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