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

Original change: undetermined

Change-Id: I99258596de2988ecc0ec5415e88db0776c37db59