Merge "Query DeviceConfig flag for Notification WakeLocks" into udc-dev