Merge "bpfmt some audiopolicy Android.bp files" into main