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

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