Merge "Merge "Fix the context leak in the ContentCapture" into rvc-dev am: 44b233c5 am: 8766dbaf am: 8e1a8334" into rvc-qpr-dev-plus-aosp