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

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

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