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

Change-Id: I54dc1817c8bb08399f50435935325b8b5535942f