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

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

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