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

Change-Id: Ib66210326afd764ed891c085e8b620ea86fd5fce