Refreshing incfs from the recent AS build.

Cherry-pick from AOSP to fix merge conflict.

Bug: 186668681
Test: builds
Change-Id: I947ba83ee11e835967880c1d77d1087c7aef28c4
Merged-In: I947ba83ee11e835967880c1d77d1087c7aef28c4
2 files changed