Merge changes Ibd05948e,Iff48671a

* changes:
  leaudio: Improve active device handling
  leaudio: Minor typo fix
tree: b19552c182d300ffa4f3ef90db94864851d18719
  1. android/