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

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

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