Merge changes I28e5a5c5,Ic8be34f3

* changes:
  Remove @FlakyTest annotation from ActivityManagerServiceTest.
  Fix AMST#incrementProcStateSeqAndNotifyAppsLocked.