Merge "Merge "Align CryptoInfo value and identity equality" into rvc-dev am: 9a2fdad0 am: 1a9fb93f" into rvc-d1-dev-plus-aosp