[automerger skipped] Merge "Restore the null behavior of buildWifiTemplate" am: b28522599e -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: I23d2c4c540b71b653884950290edb06d9ef76ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>