[automerger skipped] Split rkp from keymint am: 3a810627e0 am: e4ba64e50a -s ours am: 48bb28389b -s ours

am skip reason: Merged-In I3734bd7647cbb7b33ef654ba2fb40fe8a648689e with SHA-1 e0724843ed is already in history

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

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