[automerger skipped] DO NOT MERGE: ViewRoot/BBQ: Cleanup flushShadowQueue am: bda55e32 am: 230584c8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id1d4a3331f4c8a562d19f0e0b47796ad92d7906f