Merge "android.view.Surface: Add parceling warning" into nyc-mr1-dev am: 0656931d18
am: 033defa1a0

Change-Id: I9bf3f96a6257d462fcb31a24434ef4c22aff125d