Import updated Android SetupCompat Library 248976877
am: 8f4ffea5e2

Change-Id: Ibaccaaf47e7096493aa8a884e5418f3145a67c22