Import updated Android Setupdesign Library 313865830 am: d4a805c416 am: fc8c47718e

Original change: undetermined

Change-Id: I2f028f3413c666fc0428f82e06c6ba22db3e96ea