Import updated Android Setupdesign Library 248976877 am: d18b2a23c1 am: 8a5169b8a8
am: b240f3b92e

Change-Id: I20671b25ae4c49673b21b21d0867c9b50360d523