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

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

Change-Id: I431125036c4140432bf6ad7866bb38ccb7cbdb19