Merge "RIL changes to allow the modem to query the framework for the key." am: 9af336425e
am: 88c489b6bd

Change-Id: I12943d9a627babc2f82a461863e12c93ca8be247