Merge "Merge "Fix the context leak in the ContentCapture" into rvc-dev am: 44b233c5 am: 17ad352d am: 0e17daaf" into rvc-qpr-dev-plus-aosp