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

Change-Id: I4e26c7106070cde92bfacab7cbc99d4221a1791e