Merge "Make Shell require permission for a new CTS test"