Merge "Add FLAG_ONGOING_SESSION_MANAGED to javadoc"