Merge changes from topic "rkp_v3" am: 5ae39a28c2 am: bf3fd233cc

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

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