Merge "incfs: tolerate either ptrdiff_t or size_t for std::span" am: f93b1f96 am: 405237f2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2202603



Change-Id: I69d99c2abfc9f0e9145cafa23180a34418c1f326
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>