Merge "Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev am: b569eedf37" into oc-dev-plus-aosp
am: 3f3a19183e

Change-Id: I01a5285918e355004d25cc9fbb04c70926a28cfa