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

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

Change-Id: I235b7950c7e564212d2883b5fec2112fb15fb9d8