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

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

Change-Id: If771cb03e46bf6fc4ae7ee56d78866afaa359209