Merge "Made Context.CONTENT_CAPTURE_MANAGER_SERVICE visible for tests." into qt-dev
am: 05ec93ebc9

Change-Id: I9f0be45afbe50ca609f62ee32238a21b7beea0ba