[automerger skipped] Merge "AudioPolicy: managerdefault: fix onAudioDeviceUpdate callback" am: 8607a8bae7 am: 2beb1dedfd -s ours am: 25df218e75 -s ours

am skip reason: Change-Id Ia9c2570f687166f38335ed7efae28920f7acc474 with SHA-1 7feb854e9f is in history

Change-Id: I3aee4d76308c220e2003624ee71ff99f4968a630