Merge "Fix integer sanitizer in audiopolicyservice."
am: 8d21f0ae56

Change-Id: I0c42b36c9ba0f7f69bf722bac3e93b7b66f09f7e