Merge "switch identity back to V4" am: f856184c02

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

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