Import updated Android Setupdesign Library 248082482 am: 2eb34e37de
am: 8794c93e6b

Change-Id: I6c8974a6d44ebf8607f86a386ffbc20f61828cbb