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

Change-Id: I03551843034c95f52de64297d0d4c71b9e2e7034