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

Change-Id: Ia73fe260aa2a8713675b74f315e1925257794ae0