Merge "Merge "Re-word "Disallow USB File Transfer" manual test." into nougat-mr1-cts-dev am: f86643ed2d"