Merge "Merge "Align CryptoInfo value and identity equality" into rvc-dev am: 9a2fdad064 am: 98269ecfdb" into rvc-d1-dev-plus-aosp am: 2e2d9eced2

Change-Id: Ic4fbb92cd80666f1f9863086aa5a55b496ec8555