[automerger skipped] Merge changes from topic "cherry-pick-rkp-hal-split" am:...

[automerger skipped] Merge changes from topic "cherry-pick-rkp-hal-split" am: 75dd6a15 am: a960bc34 -s ours

am skip reason: Merged-In I86f864003e38224936375930891abb38f7d55d3d with SHA-1 0ea8e5bb is already in history

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



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