Merge "Merge "Align CryptoInfo value and identity equality" into rvc-dev am: 9a2fdad064 am: 1a9fb93fb8" into rvc-d1-dev-plus-aosp am: 557542d4e0

Change-Id: Ic9fd1b4c7ba5886fbe4cb7af81781b5d74c3ed86