Import updated Android SetupCompat Library 308970672 am: aa1a894e84 am: e4517ff917

Change-Id: If7339e6e5950179d516bebe91edd98d5a32ac721