Merge "AudioPolicyService: Properly handle service restarts in UidPolicy" into pi-dev
am: 63977aac6d

Change-Id: Iadf1a052c8bbcf27335444e54c6c96ff53323379