Merge "Import updated Android Setupdesign Library 515501800" into udc-dev