Merge "Merge "Wait on frame work fences when frames are dropped" into...
Merge "Merge "Wait on frame work fences when frames are dropped" into nyc-mr1-dev am: 60fca420 am: a60a2731" into nyc-mr1-dev-plus-aosp
am: 624ec720
Change-Id: Ic54b7595e1a23ab92cc8aa740a278ad530b44512