Import updated Android Setupdesign Library 313865830 am: d4a805c416 am: fc8c47718e am: 85a49a8961

Original change: undetermined

Change-Id: Ibaa408f483f589ad60c1f8bed5f21b6fe6ee9483