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

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

Change-Id: I2683d37ee3f977f327ffe71f7239490148dcf431