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