[automerger skipped] Merge "Rework blast sync callback model" into sc-v2-dev am: f7fc07271f am: a3b02ba67e -s ours

am skip reason: Merged-In I24dd19ab2746be3fc33e597761abf8c5249f8b5b with SHA-1 9c13753526 is already in history

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

Change-Id: I9e587f097ec8cc37a543490482731c827ce103cb