Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
am: 06802167e5

Change-Id: I3370a3c8853d171b29856d2a94e7121e6a5ad1b5