Merge "Add Settings.Global.WIFI_WAKEUP_ENABLED flag." am: d758ce1586 am: d738140b8d am: a4d7d45df9
am: 50905a474f

Change-Id: Idc7bc3e35343b06adebb035cc00b555db54289c5