Merge "incfs: tolerate either ptrdiff_t or size_t for std::span" am:...

Merge "incfs: tolerate either ptrdiff_t or size_t for std::span" am: f93b1f96 am: 405237f2 am: 7dd0f616 am: 09c6bfec am: ed9022cd

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



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