Merge "RECORD_SOUND must be handled by sound recorder app" into marshmallow-cts-dev