Import updated Android SetupCompat Library 246869926
am: d66b8aa735

Change-Id: I938db7729bdd25e30f17bd62b5c5ea8fe27217b4