Merge "Merge "Improve vts_fs_test fs#PartitionTypes APEX check" into android14-tests-dev am: 3dd1ff2f2a" into android15-tests-dev