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

* commit 'a7706ab4449bf6fd3391eb2bda76257afa64bc71':
  Camera3Device: Validate template ID