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

Change-Id: I44684992b63a472c211cd504fe506d0b71bf5386