Merge "Camera3Device: Validate template ID" into klp-dev am: ac5ef62 am: e57ada1 am: d6e3220 am: e2049c7
am: edcd8f9

* commit 'edcd8f90cd5513b4992dc12955bca3163b763c6d':
  Camera3Device: Validate template ID