Import updated Android SetupCompat Library 308970672 am: aa1a894e84

Change-Id: I7355f1f36c308cafefb9eb897ff0e1a2b325fb1e