Import updated Android Setupdesign Library 309863724 am: d520f469f4

Change-Id: Ibe4a4ba5aaf489aaaaa71a1c138885d093ecc413