Import updated Android Setupdesign Library 248082482
am: 2eb34e37de

Change-Id: Id446c1bc2af0854b4616d818314c8e476d537511