Merge "RIL changes to allow the modem to query the framework for the key." am:...
Merge "RIL changes to allow the modem to query the framework for the key." am: 9af33642 am: 88c489b6 am: a6dabb56
am: 4a29cc23 -s ours
Change-Id: Id0b54949619530b32d08ee1c8bbfec9dcb21c5c1