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

Change-Id: Ife22928f9676ff10c23cc317b22e3e032424d513