Merge "Add possibility to configure SPN during Wi-Fi Calling and Flight mode"
am: 777235c467

Change-Id: If9c175fdca9e0ee4c5cee74773f254c95d3bb328