Merge "RIL changes to allow the modem to query the framework for the key." am: 9af336425e am: 88c489b6bd am: a6dabb56a6
am: 4a29cc235b  -s ours

Change-Id: Id0b54949619530b32d08ee1c8bbfec9dcb21c5c1