Merge "Fix the context leak in the ContentCapture" into rvc-dev am: 44b233c55d am: 8766dbaf8c

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

Change-Id: Ia9a003e3f59d8252e630fffe8782178839ffbebb