Merge "[automerger skipped] Merge "Allow system processes to set near-future...

Merge "[automerger skipped] Merge "Allow system processes to set near-future alarms" am: 58dd4e78 am: ce88f62e -s ours" into rvc-dev-plus-aosp am: 1e582c33 -s ours am: 97ff0d75 -s ours am: 4e02982e -s ours

am skip reason: Change-Id Ic987eb168fb632d77e841f33518c2d0ea650693e with SHA-1 7f8041f2 is in history

Change-Id: I346029fc8ae11f4fd302219624217be37728247e