Merge changes from topic "b/168277359"

* changes:
  ClientModeImpl: Ensure we don't end in progress connection event
  KnownBandChannelHelper: Partial revert of ag/12269588
tree: 634a620e96124361a133f2bb7a249154f14795c6
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg