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

Change-Id: I4f03288f78bb89a7940f5757373c97ea0ca407db