Merge "Revert "Merge "Mark AppStateTrackerTest#testAllListeners as Flaky." am: 2a5005aca7 am: e112ed78d5""