[automerger skipped] Limit the ServiceFriendlyNames and limit the number of Passpoint per App am: 3c5afb4cd0 -s ours am: c0e13ac078 -s ours am: b2031791f4 -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: I6bb7be9b30af95cf3d5ba5f9f0b6400bee117d93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>