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

Change-Id: Iedafc28d1a63b708b1992e4ef3570069c59d087a