Merge "Merge "Fixing a bug where content capture sessions with child sessions...

Merge "Merge "Fixing a bug where content capture sessions with child sessions could get stuck in a state where no event flushing other than forced flushes would occur" into qt-r1-dev am: 4aa0aead am: 245fc50c" into qt-qpr1-dev-plus-aosp
am: f5c967fd

Change-Id: I86d10a2b70c234827addc283932b6731d7c0f783