Import updated Android Setupdesign Library 313865830 am: d4a805c416

Original change: undetermined

Change-Id: Ic3fbf33bd9a6c6b84995c46ecdd97c6d90fc915d