[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 skip reason: Change-Id Iab9cd5acfeabd114371a8aaaa406a4a1c5919f98 with SHA-1 ef2a4c38 is in history
Change-Id: Ie0ee3df0e6606ee2491e8d917ac9dbf33bd8f159