Merge "Enabled Content Capture in Service" into rvc-dev am: 018978b77c

Change-Id: Ic6f76f8bee58fa6be9566ee3890a4cfb187b9a6d