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

* commit 'd6e32200aa134c0fc058bc830ccce7eb4c830026':
  Camera3Device: Validate template ID