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

Change-Id: Ifc76873f03298f7d447f9d9951481c477c1b040d