Merge "Enable ProjectID for the file systems by default." am: 8acf8298f9 am: 2727ad7d1a

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1967545

Change-Id: I3c6c22f3b074131caf0e174230727f18548a2778