Merge \"Toast timeout: Just strip FLAG_KEEP_SCREEN_ON\" into nyc-dev
am: 3e5df9fb50

Change-Id: I97742b1d180ff1c38a1aa7ea0a13c981a38c1df3