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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1fd9e54553206657853d049b927eaf84266c28c