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

Change-Id: I03a19bb6f1ce10c17ea75ac0377705eb0a86447d