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

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

Change-Id: I19143c9ad81f891646634237d0c35f14be06bab1