Import updated Android Setupdesign Library 313865830 am: d4a805c416 am: 74f6535e66 am: 698d29f2f3

Original change: undetermined

Change-Id: Ifeece70607511ac92e02164073a219732e66da59