Merge "AudioService: getMasterStreamType -> RING on tablets." into lmp-dev