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

Change-Id: Ifdaf40b1b3aa3b4f4d707afdbb7978c813f842ae