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

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

Change-Id: I0b57d6d139f371b5f91f9c5ce716840662683f41