[automerger skipped] Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev am: 15602b3f48
am: 86818604ac  -s ours

Change-Id: I0c960ac7c3a9439189fe7d61b2cb9654e84bbe43