[automerger skipped] Merge "OemLockService: support oemlock AIDL hal" am:...

[automerger skipped] Merge "OemLockService: support oemlock AIDL hal" am: 00d45983 am: 6e80d3ea am: b4f48581 -s ours am: 3b3aecbe -s ours am: b44b839b -s ours am: a6fd1333 -s ours

am skip reason: Merged-In I88166cba3858dffced32fb46d59880cd844af4a7 with SHA-1 7a9e42a0 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2590006



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