Merge "Only user whitelist gets allow_while_idle_unrestricted" into pi-dev am: 3d70d20c88
am: 5ae610751f

Change-Id: Ica6f802d6ff6254a70feee45bc20a9f50617c68a