Merge "Replace all keys in sendEids" into main am: 20aea225f1

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

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