Import updated Android Setupdesign Library 248976877
am: d18b2a23c1

Change-Id: I8aed7faa9b713298b8d5227b8823226867e30556