Merge "Add DisplayManager tests to presubmit." into sc-dev