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

Change-Id: Iad23985afec005b729009010c6b27b4be8325b44