Merge "Retroactively add identity V2 to 5.xml." am: 98bdd3c979 am: b588fc9f24 am: a0c714760f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia74d2b9c847f168b86fcdf0a3b48208bec271081