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

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

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

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