Merge "Add KeySetManagerService unit tests." into mnc-dev