Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev
am: 15602b3f48

Change-Id: I8e8db64e099f0fc06363b1c91c0108285e025e45