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

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

Change-Id: Ic96e15568bb68937428c5c31f94c3a5111366d36