am 57eb1989: am ede4cfa6: Merge "Fix SlidingDrawerTest flakiness" into jb-dev

* commit '57eb19891d54673de94b09a62e664b4006c442d1':
  Fix SlidingDrawerTest flakiness