Merge "Add slotId in INetworkService.aidl methods." am: b1c6aa4567
am: 9348e258cd

Change-Id: I0dba0926979d53951cea53761a4527b246fcb98e