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

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

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