Merge "Remove hidden VideoState Annotation usage for Mainline" am: c72f84cc8b

Change-Id: I0fbeb2c80242740cddff1c0911c6a95da6fb99e1