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

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

Change-Id: I6792c7c7800878afd5b3c8ffb62fb919d2e6fc0a