Merge changes I85952846,I049faa30

* changes:
  Audio Aidl: Unify naming for conversion methods
  Audio Aidl: update switch handling