Merge "Implement oemlock AIDL default" am: c1bd610345

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2303397

Change-Id: I5b1adc64e467183cc047201d44780cf9670f0e56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>