Merge "KeySetManagerService: prevent NPE" am: c66327149a am: 51ad0f67d2 am: 7adb348796
am: 8734438320

Change-Id: I8618393edf8c2c41663dfb457588ac4f9511239c