Merge "Restore the null behavior of buildWifiTemplate" am: b28522599e am: e224c32064

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

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