Merge "Remove ContentCaptureServerSession when app died." into qt-dev
am: 094b9acb0d

Change-Id: I4a211d7005e2d9e4c4abc63f24d37f84e31df96b