am 88f931bd: am 1705113e: Merge "API for converting AudioAttributes to stream type" into mnc-dev
am 88f931bd: am 1705113e: Merge "API for converting AudioAttributes to stream type" into mnc-dev

* commit '88f931bdd1f6e8175bb524501a0718e437a7eb25':
  API for converting AudioAttributes to stream type

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