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

Change-Id: I4f9dbd1579ef70106f6d2b32acf1dedbe7f2e24c