Merge changes from topic "perband-onet" into sc-v2-dev-plus-aosp

* changes:
  [conflict] 5G opportunistic data config per-band. 2p: a990c6dab9
  5G opportunistic data config per-band.