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

Change-Id: Id0f5d71df9a06993a519d787aa8eb16d6144f67b