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

Change-Id: I82d9c8ca050eefa75bcafb210863aa06cf546896