Merge "Adding @IntDef checking for Video Quality and Video State values."