AlarmManagerService: Fix 5.0.2_r1 source merge

Change-Id: I08294980b4bff6f34ac0f5c503958f054866c2b0
Merge "AlarmManagerService: Fix 5.0.2_r1 source merge" into L5