tree 941297b7c694d755e3a0dcbcd62d07cc01ef6ffa
parent 099ed3c2b0752c14d4036795deae03404d643be1
parent b3f45dc17bff671a5ce3795e4016b7dbbf175aa8
author Nate(Qiang) Jiang <qiangjiang@google.com> 1681842648 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1681842648 +0000

[automerger skipped] Merge changes from topic "presubmit-am-43ba189e62fd43bfb97cbf67dd844d05-tm-qpr-dev-tm-dev-sc-v2-dev-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 4623cc647b -s ours am: 58f248d465 -s ours am: 2863cf18dc -s ours am: b3f45dc17b -s ours

am skip reason: Merged-In Id37e395f4f4f05b7901b718e3ea84c56b95cdfe7 with SHA-1 2a13c8da4f is already in history

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

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