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

Merge changes from topic "add rkp to identity-default" am: 79fdf4d6 am: acc72156 am: 7897aabe am: 16a2b066

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

Change-Id: If0570472c1c20c7aa9886e8e1b038f51577a717b