[automerger skipped] Merge "AlarmManagerService: Fix FWR before boot...

[automerger skipped] Merge "AlarmManagerService: Fix FWR before boot completed" into rvc-dev am: 71c8e9a0 -s ours am: f90093fd -s ours am: 356416e2 -s ours am: d9997bc7 -s ours
am skip reason: Change-Id Iab9cd5acfeabd114371a8aaaa406a4a1c5919f98 with SHA-1 ef2a4c38 is in history

Change-Id: Ic703c4ec7f3e3e8e3038909accbe9149b720b5cf