Merge "APM: Allow VOIP_TX input selection" into oc-dr1-dev
am: cb815c959f

Change-Id: I84ea8b2c51e999a1f4845f653f6b9e1dfdb9c63b