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

Change-Id: I950f4617cbe6abcd8c943e1cc0b5aba60163f202