[automerger skipped] Merge "Enforce basic thread safety in Audio Policy...
[automerger skipped] Merge "Enforce basic thread safety in Audio Policy Service" into rvc-dev am: 6ffc5162 am: 751a55ef -s ours
am skip reason: Change-Id I47b132c8b5c977812fad5c89fa57882a37779c18 with SHA-1 12b716ce is in history
Change-Id: I253b661f238d3bb233c20017b160619cdb348017