[automerger skipped] Merge "[incremental] parcelable for incfs file descriptors" am: c8b066091e am: c93841a265
am: e63063585c -s ours
am skip reason: change_id Ifc3a43633356951b239486d66ee80d120bc4ab76 with SHA1 0037c3fef2 is in history

Change-Id: I85e820abbfd5189bca23a6ba63c1354a61286a1c