Merge "Merge "Moving the NO_SESSION_ID constant from ContentCaptureSession to ContentCaptureManager" into rvc-dev am: d347c7acaf am: 5343cf1c4e" into rvc-d1-dev-plus-aosp am: 36c9870be1

Change-Id: I45b168058195a225726988d4a26aefd980c8bef9