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

Change-Id: Ibe30bc5e27470a89eb6d98cf77d6ca85e5624f64