Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and...

Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884



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