Merge "[Settings] fix for Wifi calling settings page crash" into sc-dev am: a415ecb608
am: 601ee61c43
am: 2f2691216a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15125472 Change-Id: I347e67cd10bc7523c3249a555452cf3c5de1f652
This commit is contained in: