Merge \"Merge \\\"Redraw if dirty during stopped when resumed\\\" into nyc-dev...
Merge \"Merge \\\"Redraw if dirty during stopped when resumed\\\" into nyc-dev am: 5b4ff21a am: f22f6cf0\" into nyc-mr1-dev-plus-aosp
am: 5fc7f18e
Change-Id: I77f8fddc33195d28f85ebc254bbb8cf6b3013348