Import updated Android SetupCompat Library 312662043 am: c6d9290302 am: 20bab2f6f4

Change-Id: If9735a4be3eca97d77785a94219f8b006d27b8f1