Merge "Revert "identity - temp interface change"" am: 9624940b40 am: 9b91af6739 am: 75210d1962

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

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