Merge "Add possibility to configure SPN during Wi-Fi Calling and Flight mode"