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

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

Change-Id: I3e17793e2293f59b9fd3e447f2f3c7491f356ba0