Merge "Camera2: CaptureRequest: Use common code for Surface unparcel" into nyc-mr1-dev am: 0545420a16
am: 5b85fcdb89

Change-Id: I1cbe60d3806cee0f7f9c7fa3b131fd45e3a267ff