am 39482cfa: am 19a41464: am 6cfe86ad: am 41f66cec: am 43a17442: Merge "Make LauncherApps tests less flakey." into lollipop-cts-dev

* commit '39482cfa790ae8733f4b2632a1ba4ccc9df544fe':