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

* commit 'a4996d9f0edece83bcb7ea85a8dae0e90a9221d1':
  Camera3Device: Validate template ID