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

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

Change-Id: I5fa3d5606573ef821294bad037dd5207fdf01373