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

Change-Id: I1a159692cf3c3cc17c2eb8ce82d3e981b8a88ec4