Merge "Fix ContentCaptureManagerTest test fail." into rvc-dev am: 3361dd2ad3

Change-Id: Ie4788677e235f066af2d210f7a59ceb98b356325