Merge "identity: Make NoS libeic and AOSP libeic align" am: c9cb222b2c

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

Change-Id: Ic5cf6fc84862a7f795ec2d084260bbfffa6f81c8