[automerger skipped] Restore the null behavior of buildWifiTemplate am: 843cd6ca48 -s ours

am skip reason: Merged-In Iefb976ed86a732158964fae38e9e601001c2637a with SHA-1 4c0fb401be is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2527139

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