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

Change-Id: Ia299c970a57cbd53574bf430ac354abe254a457a