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

Change-Id: I7257f8f3c6023df10cd639784a21f216851d29b9