Merge "Revert "Enabled Content Capture in Service"" into rvc-dev am: 18ee16a6d5 am: 224e5bf91d

Change-Id: Ifbdfbb96d436189a5ddb7c970dcecb32cfdff0fd