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

Change-Id: Icc4d2d025c03cc71557e359bf8f4f230d38ef595