Merge "Camera3Device: Validate template ID" into nyc-dev
am: 3c8aa2fded

* commit '3c8aa2fded9e5c5daf8a3e6ac8acbe3d329d8e65':
  Camera3Device: Validate template ID