Import updated Android Setupdesign Library 242706621
am: 9d1af16dcc

Change-Id: I85aa4139bde453da4127e5823946c3568e0d96ba