Merge "Flush Content Capture context updated event immediately" into sc-dev am: 3a4b5e08 am: 46b26a50 am: 153b4668

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

Change-Id: I202de006f74e6b73f4827606e8d124be94b14b6b