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

Change-Id: I0b56b7bc6a00da71bfe5e456ca430f0ee5099abf