Merge "Flush Content Capture context updated event immediately" into sc-dev am: 3a4b5e0817

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

Change-Id: Ia80018aafb59ac660ea8f7268e6b26207eb5db33