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

Change-Id: Ie143802009a056ac0ef66bdb0a7c0263c3016f39