Import updated Android Setupdesign Library 309863724 am: d520f469f4 am: 5ca022ae6f

Change-Id: Ib57a74ffa66184ed5cf1f1693d21d67ca45ca601