Import updated Android SetupCompat Library 246869926 am: d66b8aa735
am: 6d375af517

Change-Id: I072cf2b2d9ad46d5e720da4a92ea0f89ee23bd35