Import updated Android Setupdesign Library 313865830 am: d4a805c416 am: 74f6535e66 am: 09a5e8e0fb

Original change: undetermined

Change-Id: Ib7b79f11088deebff8024f4cee1e5c6a9be83cd1