Merge "Camera3Device: Validate template ID" into klp-dev
am: ac5ef62

* commit 'ac5ef6284656864eca089da83edfd062ea8139b7':
  Camera3Device: Validate template ID