Merge "Fix widget manager / alarm manager deadlock" into pi-dev
am: 77d59a2f6f

Change-Id: Ia85c10b562ddc96a1ad2af6a20ad12bac8033aee