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