Merge changes I3fe749f5,I0fcda56c,I81188d61

* changes:
  Trigger Make Before Break
  resetSimAuthNetworks: call on all ClientModeManagers
  CMI: Make updateLinkLayerStatsRssiAndScoreReport private
tree: 731531a9b1b0f3cb648888d69ec1c5348e3b8136
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg