Merge "Zygote: Add CAP_WAKE_ALARM to system_server to properly support timerfd alarms" am: 1085be0ce3
am: 5e23ab394a

Change-Id: If1d303010a604bf6c1c745ea9e2d920eea20f5aa