[automerger skipped] Limit the ServiceFriendlyNames and limit the number of Passpoint per App am: 4df6f62ecb -s ours am: 51a324be49 -s ours

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

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

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