Merge "Add keystore2 namespace for LocksettingsService."