Merge "LockSettingsService: support authsecret aidl service"