Merge changes from topic "cherry-pick-rkp-hal-split" am: 20b32627

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



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