Merge "AodPolicy: Fix service leak" into pi-dev
am: 4f4882f2ce

Change-Id: I78c5562bf976eb55ba2991f144f48b3d4d327262