Merge changes from topic "softap_feature_set"

* changes:
  wifi: fix a bug in the ApConfigUtil.checkConfigurationChangeNeedToRestart()
  wifi: Use long to replace int for softap feature set
tree: 6f5e767520fcd3da7e115a6dfc6dd317c4a18066
  1. apex/
  2. service/
  3. PREUPLOAD.cfg