Merge "OemLockService: support oemlock AIDL hal"