Merge "Implement oemlock AIDL default"