Merge "Deprecate ActionBarDrawerToggle inner classes, update API file" into nyc-support-25.4-dev