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

Change-Id: I72d62e1d1f3d2b6db616762e724c1608a1e487c8