[automerger skipped] Merge "Fix ordered background broadcast API" am: dd6d0b26af am: 950f73800c am: bf4cf726d3 -s ours
am skip reason: Change-Id Ibf70fdbb419bbb24f2feeffedc0331e31c865a52 with SHA-1 2bc01a8764 is in history

Change-Id: Id76066694165431d794c7a2ada12cb5f8a6c314d