Merge "Merge "Fix the context leak in the ContentCapture" into rvc-dev am: 44b233c55d am: 8766dbaf8c am: 8e1a8334a1" into rvc-qpr-dev-plus-aosp