Import updated Android SetupCompat Library 248257541
am: 14649e7964

Change-Id: I2b343a063fba69283ee29f196dfdd6ab20c13c7a