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

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

Change-Id: I6c451355f6aad20f549ee6fdb98b1c33b4df1a54