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

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

Change-Id: Ie14905dddaff33b67920507262006abcfbcb0a3a