Import updated Android Setupdesign Library 309863724 am: d520f469f4 am: 5ca022ae6f am: e97595b2a1 am: 2c0a241eae

Change-Id: I532c770c215b72b8b556712f62da19ef20cbb908