Merge "Reset num saved networks with mac randomization before counting" into qt-qpr1-dev
am: 359adeade8

Change-Id: I25d233001d5db2649f9bc592ae9df215f21a2618
tree: 1b98ccb3bc58f26d1ae91d3307c9f67e34bd12ba
  1. service/
  2. PREUPLOAD.cfg