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

Change-Id: I902e792e2d4696b94fd767e5b31e6f4c4bbcdb1f