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

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

Change-Id: Ic769831b73df73ad7e9703ff6839b038f3bb3346