Merge "Remove hidden VideoState Annotation usage for Mainline" am: c72f84cc8b am: 5f9d8c3bcc am: 3dbb770102

Change-Id: Icb9201e77b0a621c2ca2c21ec95e60739b23e9ae