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

Change-Id: I5a024daa0fc57238c35b794b29a8b2153beb0ac5