[automerger skipped] Limit the ServiceFriendlyNames and limit the number of Passpoint per App am: f83296b5fb -s ours

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

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

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