Import updated Android Setupdesign Library 247352933 am: d77ef759a6
am: 2466812a80

Change-Id: I442640b846a8289c18d8fdbb983ce816140057ff