[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 skip reason: change_id I76715d6ea39da05fa82cec0e680a1896f5a88fe9 with SHA1 9b75308974 is in history

Change-Id: I770013ae1b7198a2510074e174c2854c9ccc1469