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

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

Change-Id: I97748f6d829a253a646adfb2a5069d400e9661e7