Merge changes I5e422dbf,I7ec22e4e into main

* changes:
  Remove FlakyTest annotations from most AppStandbyControllerTests
  Add a method to flush AppStandbyController's handler