Merge "Fail setDisplaySurface if can't enable async" into nyc-mr1-dev
am: 4db50cec13

Change-Id: I24fc902468e57e81d0e2536eeebf478db302cc63