Merge "RIL changes to allow the modem to query the framework for the key."
am: 0c83ef2c72

Change-Id: I8a326ac926e880d8095330638e54d56ad8c98485