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

* commit 'e57ada1277564469704810aa0ceb353787475c68':
  Camera3Device: Validate template ID