[automerger skipped] Merge "Merge "libincfs and libdataloader headers not using std::span" into rvc-dev am: 2c3f5d24ce am: 89f35ee572" into rvc-d1-dev-plus-aosp am: 485a19f0e6 -s ours am: 849d52cc01 -s ours
am skip reason: Change-Id I76715d6ea39da05fa82cec0e680a1896f5a88fe9 with SHA-1 9b75308974 is in history

Change-Id: I272b2814406d7cd7873220a40cc4c5fd881edd87