Import updated Android Setupdesign Library 248976877 am: d18b2a23c1
am: bbd2d8fe4e

Change-Id: I18bac1ee6d913649e096d4a74a680071de8946ab