Merge changes I29af4252,I9ba77156

* changes:
  Default existing WifiConfiguration's mac setting to trusted
  Persist macRandomizationSetting across reboot
tree: 7e594ff73f86b472bc1b981fc463be7191f50c8a
  1. service/
  2. PREUPLOAD.cfg