[automerger skipped] Merge "DO NOT MERGE: Move blast sync handling to BBQ" into sc-v2-dev am: fe34457d2e am: 5603fff05d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0de898df5a359d6768e082350ee49479b3e68eb0