[automerger skipped] Merge "Add dependency on split out RKP HAL" am:...

[automerger skipped] Merge "Add dependency on split out RKP HAL" am: 7e17f702 am: 1dfb0be4 -s ours am: b77754b5 -s ours

am skip reason: Merged-In I9dcb9b94b0e22466cd42592f4921eec3e4fcb13d with SHA-1 8e3fd246 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2295978



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