[automerger skipped] Merge "[audiopolicy] fix -Wreorder-init-list" am: db1cb2c748 am: 5ba6aad24b
am: 6de667f1c3 -s ours
am skip reason: change_id Ie129344a36893adc82e67181012e3af817bda9f4 with SHA1 a30e320885 is in history

Change-Id: Id9e4171b4d752009047890879cc1551139afc955