Merge changes I401c064c,I16431a4d

* changes:
  NetworkScoreServiceTest: Remove usages of @hide Wifi APIs
  NetworkKeyTest: remove @hide Wifi API usages