Merge "[Settings] Avoid NPE when user enter WifiCallingSettings back and forth" into udc-d1-dev am: 1765c1dc6e
am: 7d941f3e34
am: 12255bf880
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23695884 Change-Id: I12837d52779064aa3b739c7ce21061dc4d999a67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: