Merge "Implement oemlock AIDL default" am: c1bd610345 am: 220c5eca8f

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

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