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

Change-Id: I87ee907b3ea8b030857b44e4ee19c1920c0b717a