Merge changes from topic "revert-1956689-add rkp to identity-default-ENFHZTRTBV" am: 6278c2d241

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

Change-Id: I97f206dd8092435ecc4ed3d54c11155c1b6db7dc