tree 941297b7c694d755e3a0dcbcd62d07cc01ef6ffa
parent 6ee9825b61c17ac4538b28df64fad02abf586c07
parent a93c976f802e8fb9bd79b9fb5cd60b6ef645623a
author Nate(Qiang) Jiang <qiangjiang@google.com> 1681842472 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1681842472 +0000

[automerger skipped] Merge "Limit the ServiceFriendlyNames and limit the number of Passpoint per App" into sc-v2-dev am: 818a5a4ce5 -s ours am: ee457e724b -s ours am: a93c976f80 -s ours

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

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

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