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

* commit '30302ea600604ea30bae4652cd8d18fb16ee84fa':
  Camera3Device: Validate template ID