Merge "Moving the NO_SESSION_ID constant from ContentCaptureSession to ContentCaptureManager" into rvc-dev am: d347c7acaf

Change-Id: Icb0f2d9ce39da5e36ff34a1f10f492a9340312f5