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

Change-Id: I2f7c05577cb577a226cf122855754986841c8275