Merge "Moving the NO_SESSION_ID constant from ContentCaptureSession to...
Merge "Moving the NO_SESSION_ID constant from ContentCaptureSession to ContentCaptureManager" into rvc-dev am: d347c7ac am: 25bdce7f
Change-Id: I36ca63d4a1714c7732b6952017462e8bbe9035bc