[automerger skipped] Merge "Limit the ServiceFriendlyNames and limit the number of Passpoint per App" into sc-qpr1-dev am: ecfaccce8b -s ours am: 1619f43d9e -s ours am: 4906688f00 -s ours am: 4e5cc2b395 -s ours

am skip reason: Merged-In I8c1b858c8990c60cea48a59fc390f57a40ed86ba with SHA-1 4df6f62ecb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/22438865

Change-Id: I6759c5e68c7306bc9201c6c469a420625eff62a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>