[automerger skipped] Add Wifi Slice am: 46aa586610
am: b877c174a6  -s ours

Change-Id: I409a86b3ed0f76e5df9f5d9734a1f8fc286fe710