Merge changes from topic "rkp_v3" am: 5ae39a28c2

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

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