Merge "LockSettingsService: Authsecret HIDL->AIDL adapter"