Merge changes from topic "rkp-csrv3-updates" am: 5eeb73beb7 am: f23aa6407b

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

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