Import updated Android Setupdesign Library 248976877
am: d18b2a23c1

Change-Id: I29bf14edc71d879f234a133a74beb5f13c071079