AlarmManagerService: Underp upstream merge

Signed-off-by: BigBrother1984 <carlosavignano@aospa.co>