Merge "Fix Activity leak from ContentCapture Context-Updated event." into sc-v2-dev am: 7a2c5b7d9f am: 97ec2868bb

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

Change-Id: I782fb09680b3b9e33d3f3fa1d357dd95f4949ccc