Merge "Update Wi-Fi Wakeup setting to check whether the feature is available."...
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev am: 25d1848e
am: ac1b9354
Change-Id: Ieec705671f062119f67a94b559edc40762d90950