Merge changes from topic "revert-1959803-revert-1956689-add rkp to identity-default-ENFHZTRTBV-OLKYWRVSFZ" am: ff225d91c0 am: 644d624bfb

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

Change-Id: I99635fb0fb724ae242fa9469f6592f652ceafddf