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

Change-Id: I5e2ad4633c19c7518bd3eee85aaf60c324d78154