Import updated Android Setupdesign Library 309863724 am: d520f469f4 am: 38173640f3 am: e92f46def4

Change-Id: Ib86ae60758e701a5f21b1f396e244d056b1dd4f7