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

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

Change-Id: Ia535171c753ec98e004ece3b565b34404199e0ed