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

Change-Id: Id977a8fbf4b3e01716ff21a5abbb2cc45912cb41