[automerger skipped] Merge changes from topic "presubmit-am-2f502d40fb7c4790868f116278a68a44" into sc-qpr1-dev am: 02799a6dac am: a5291fcaec -s ours

am skip reason: Merged-In Ia212666450fd9fe3a95393defa2fb56383bab83a with SHA-1 0c3de17f51 is already in history

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

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