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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882491

Change-Id: I542b761b92c268cddb050e72b83a421eac514a50