Merge "Fix ContentCaptureManagerTest test fail." into rvc-dev am: 3361dd2a am: 1b734738 am: ce99ad85 Change-Id: I3198e833edfb80c578ab4512b64787c4fbc318d9