Merge "Radio Interface changes to pass the encryption object, including the key,to the modem." am: aadb414f02 am: 717b5bf3e0
am: 8532bc3b59

Change-Id: Idd49ae115d660cb21ed7baf4e66f5ec0f89e3e53