am 95037fb1: Merge "Fixing some flakiness of some DL Manager tests." into gingerbread

Merge commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368' into gingerbread-plus-aosp

* commit '95037fb1a633f5bdeb4e0ece2d18a4974259c368':
  Fixing some flakiness of some DL Manager tests.