[automerger skipped] Merge "Limit the ServiceFriendlyNames and limit the number of Passpoint per App" into tm-dev am: 8cb8860e09 am: 0b3a971bee -s ours am: 56db030de5 -s ours

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

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

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