Merge changes I1679c378,Ifdee29ce

* changes:
  WifiLockManager: remove call to WifiNative#getClientInterfaceName
  ClientModeImpl#syncGetSupportedFeatures: change to getSupportedFeatures
tree: 89bb955fb9b3e5a0b1cda1836f7956b34a3c8c90
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg