[automerger skipped] [automerge] Limit the ServiceFriendlyNames and limit the number of Passpoint per App 2p: 226cf2c1d1 am: 8b4346a6af -s ours

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

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

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