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

Change-Id: Icc96d9f0d421908e7d7d8ea7b19d6a180cbf7ffd