am 646ce9d2: am 7d3377ce: Merge "Camera2: update still capture template requirement"

* commit '646ce9d2bfe1e1d287b41cbfb9d77cdbfd708f5c':