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

Change-Id: Ib8ce91f4936c649eb09935b884f2063b0989149b