Merge changes If970d851,I5bd11574

* changes:
  WifiManager: API upates for O
  WifiConfiguration: Remove priority field