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

Change-Id: I6ed63c5efecf265ef9614c8d81a4a7343060fa8b