Merge changes from topic "add rkp to identity-default" am: 79fdf4d688

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

Change-Id: I5d9530ebdd56ac364d0eb4bb6853f35f75210c79