Did Abbott sign a bill in 2019 to raise the age from 18 to 21 to buy cigarettes?

Did Joan Huffman write a bill intended to Socially Distance smokers from High School students and did Abbott sign that Bill to raise the age on e cigarettes and tobacco?