[automerger skipped] Merge "Limit the ServiceFriendlyNames and limit the number of Passpoint per App" into sc-dev am: f14bd253b5 -s ours am: 1b640f51f0 -s ours

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

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

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