Merge "Move display mocking tests to DisplayServiceTests" into udc-qpr-dev-plus-aosp