Merge \"Fix telephony service crashing on CryptKeeper mode\" into nyc-mr1-dev
am: 54cda7fcb5

Change-Id: I4a0351645f4748e503113c27b14ff03ac85a503c