Merge "Revert "Enabled Content Capture in Service"" into rvc-dev am: 18ee16a6d5 am: 224e5bf91d am: 6ea62a8cea am: 06402d6195

Change-Id: Ifd399a364f5553197858a15057d472287e79d185