Merge "Suppress deprecation warnings in LegacyTypeTrackerTest." am: 8d55b55f60

Change-Id: If35be28eac763d01b99078f171da8ff56d90d93f