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

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

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