Revert "Revert "Import updated Android SetupCompat Library 231343431""

This reverts commit 232a2831bdbc44a82d27dfa66a01fc05830f4fa3.

Reason for revert: Roll forward

Change-Id: Ia6268a63db726ed3092b44edb23601932a984606
24 files changed