Merge "switch identity back to V4" am: f856184c02 am: 9ca7f9982e

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

Change-Id: I1da310534196b8e0badb0445b9ee1dfed3469353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>