Merge changes from topic "cherrypicker-L30400000959589263:N26400001354472878-tm-qpr-dev-tm-dev-sc-v2-dev-sc-qpr1-dev-sc-dev" into sc-qpr1-dev

* changes:
  [automerge] Limit the ServiceFriendlyNames and limit the number of Passpoint per App 2p: 226cf2c1d1
  Limit the ServiceFriendlyNames and limit the number of Passpoint per App