Import updated Android SetupCompat Library 379335714 am: cdc282e9ef am: f0a54b2317

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/setupcompat/+/14963615

Change-Id: Iec4dbb854873e9eb351cf3d353bbd705937c260c