Merge "Add carrierKeyLength parameter in RIL_CarrierInfoForImsiEncryption structure"
am: 94ae999327

Change-Id: I98757b762a57b7e9039909a9371250791e42b8b4