Import updated Android SetupCompat Library 248976877
am: 8f4ffea5e2

Change-Id: Iba2b0e6a1bff477aed2f1bbd9b599bbcf2eea942