tree 2a739d4e53a463a609bdf6ae1bfa473b75daf9f2
parent 730632d650b0d34c356cecb5973cfabd500a32b7
parent 860050876570b4df2e8991fd2344d0c4326dd0b6
author Nate(Qiang) Jiang <qiangjiang@google.com> 1681590225 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1681590225 +0000

[automerger skipped] Merge changes from topic "presubmit-am-fd8707a3b4d4466780d210574fa9f832-tm-dev-sc-v2-dev-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 858948cc60 -s ours am: 8600508765 -s ours

am skip reason: Merged-In Iede626004a1ea46f47b185777c97794e4d3ded4e with SHA-1 1bb18bd0a8 is already in history

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

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