Merge "audio policy: fix audio device properties loading" am: 59ed83cc16 am: 09a36e5dd3
am: 5ed0e52ed1

Change-Id: I0520a719709a37773ebc5b14b36c857ba1c6db45