Merge "Camera2: Set appropriate template for pre-capture" into rvc-dev am: 86f6fed52c

Change-Id: Ie98d2aa87ac4c19f9a6566b59c3b54e52087479b