[automerger skipped] Merge "AlarmManagerService: Fix FWR before boot...
[automerger skipped] Merge "AlarmManagerService: Fix FWR before boot completed" into rvc-dev am: 71c8e9a0 am: 7594c10b am: 02b5664f -s ours
am skip reason: Change-Id Iab9cd5acfeabd114371a8aaaa406a4a1c5919f98 with SHA-1 ef2a4c38 is in history
Change-Id: I26f9ca12290f78131963071b765408a5da3129d2