[automerger skipped] Merge "Limit the ServiceFriendlyNames and limit the number of Passpoint per App" into tm-dev am: 8cb8860e09 -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: I937e73a90d62af9dd287152665cbc13373ee2dff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>