[automerger skipped] Merge TQ2A.230305.008 am: e7a29bc73c -s ours

am skip reason: Merged-In I2788772c8f2f863f0f2117235483b1dd57ab4ae6 with SHA-1 a50b83a25a is already in history

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

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