Merge changes I6dfd32a4,I6a1f18c4 into rvc-dev

* changes:
  RELAND: WifiKeyStore: Always use a different alias for CA
  WifiServiceImpl: Read verbose logging flag after checkAndStartWifi
tree: 963444cc2b9cc08006be3f7844ee31c1034eb03b
  1. apex/
  2. service/
  3. PREUPLOAD.cfg