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

* commit 'a069be3143313583b2212824ebf34586ab80223d':
  Camera3Device: Validate template ID