Import updated Android Setupdesign Library 247352933
am: d77ef759a6

Change-Id: Ie03bb3085bf286768977add7417ff0778a2c36da