Merge "[audiopolicy] fix -Wreorder-init-list" am: db1cb2c748
am: 5ba6aad24b

Change-Id: I615c232d7ba9ef5661648515e9293ead58cc7d8e