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

Change-Id: Ic611ebb7cd59623f679782219a3800fda10ac289