Merge "locksettings: Add AIDL weaver HAL support"