Merge "Add @hide to RttAudioMode IntDef" am: 22af0f3377 am: c284379659
am: f000639f82

Change-Id: Ibcb239e0aa3499386f6f71026084276b07554cdb