Merge "Camera2Tests minsdk bump from 19 to 21" into main