Merge "Stop using audio device types as bit mask in policy.h"