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

Change-Id: I9c5a04335e56c751428db6ffa0ba5a263fbdc043