Merge "Limit the ServiceFriendlyNames and limit the number of Passpoint per App" into tm-dev am: 8cb8860e09

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

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