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

Original change: undetermined

Change-Id: I1541c6d4bf39e3cc7169cb708882e2f00686d52f