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

[automerger skipped] Merge changes from topic "cherry-pick-rkp-hal-split" am: 20b32627 am: ba3334a4 -s ours am: 4ed8913a -s ours

am skip reason: Merged-In I032d30e5f46aa3fc0dd7b95373180b9653ccbf23 with SHA-1 f6233e65 is already in history

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



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