Merge "Revert "Import updated Android Setupdesign Library 230837776""