[automerger skipped] Limit the ServiceFriendlyNames and limit the number of Passpoint per App am: 4df6f62ecb -s ours am: 51a324be49 -s ours am: 05936d2020 -s ours am: 6ee9825b61 -s ours am: 360b9e486f -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: Iebc7fca0fa9ee9c557f8a6c3bf07918382d4b479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>