Merge "[automerger skipped] Merge "libincfs and libdataloader headers not using std::span" into rvc-dev am: 2c3f5d24ce am: 46bd980157 am: b959c73570 -s ours am skip reason: change_id I76715d6ea39da05fa82cec0e680a1896f5a88fe9 with SHA1 9b75308974 is in history" into rvc-qpr-dev-plus-aosp am: b1cd6a54e4 -s ours
am skip reason: Change-Id I76715d6ea39da05fa82cec0e680a1896f5a88fe9 with SHA-1 9b75308974 is in history

Change-Id: If9e1e52d330fea0428e262b7545e19ae65f0cc84