Import updated Android SetupCompat Library 312662043 am: c6d9290302 am: 93f6d15b4a am: 501c2de16a

Change-Id: Ia7e34b8782f7d723803ccd6fb69740c8846f0853