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

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

Change-Id: I6fcd22ecaa84c3b9b47c52391e775332a9a927b5