Merge "Propogate disabled state to content capture session after changing user restrictions or on ccm.setContentCaptureEnabled()." into qt-dev
am: 9f590ef1a9

Change-Id: I5fedb104718c3fd22a54f7c5caec1dc18cb3a2e7