tree c2fd52b9581b63669d9f2c7ab7dd9d364cce3ae9
parent b2031791f4d59c9c42013bc41dea9b8e0c1489f6
parent 1619f43d9e5ccae737d0fb2058f0bc872b34d475
author Nate(Qiang) Jiang <qiangjiang@google.com> 1681841000 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1681841000 +0000

[automerger skipped] Merge "Limit the ServiceFriendlyNames and limit the number of Passpoint per App" into sc-qpr1-dev am: ecfaccce8b -s ours am: 1619f43d9e -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: If19e3d3e555831ea58a8f928d61fb2c47c1ea830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>