am 9d4ae826: am 306cf947: Merge "Fix race condition in testSendOrderedBroadcast1" into lollipop-cts-dev

* commit '9d4ae82692d7afeff8cad43e6888b536d4781dd1':
  Fix race condition in testSendOrderedBroadcast1