Merge "Merge "Moving the NO_SESSION_ID constant from ContentCaptureSession to...
Merge "Merge "Moving the NO_SESSION_ID constant from ContentCaptureSession to ContentCaptureManager" into rvc-dev am: d347c7ac am: 5343cf1c" into rvc-d1-dev-plus-aosp am: 36c9870b am: c8374003
Change-Id: Iad30c9abe82650f2c4917cec3cbad5b974a8f31c