Merge "Merge "Fix the context leak in the ContentCapture" into rvc-dev am: 44b233c55d am: 17ad352dbf am: 0e17daafa2" into rvc-qpr-dev-plus-aosp