[automerger skipped] Merge "DO NOT MERGE: ViewRoot/BBQ: Cleanup...

[automerger skipped] Merge "DO NOT MERGE: ViewRoot/BBQ: Cleanup flushShadowQueue" into sc-v2-dev am: bec1fdfc am: 30f2e216 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4ae1d62eb86e2e0e6d04cb85de8854c44f9436f6