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

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

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