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: 5343cf1c
Change-Id: I2b341c809f22a898da4c50ca74b1b4bf5e08e797