am b0f079c0: am b1c0dd86: am 485ce740: am 041a618b: am b3877999: am 8dab941b: Merge "Fix race condition in testSendOrderedBroadcast1" into lollipop-cts-dev automerge: 306cf94

* commit 'b0f079c04e5a0708f393a49fa5f5f1f977ef01fa':
  Fix race condition in testSendOrderedBroadcast1