Import updated Android SetupCompat Library 379335714 am: cdc282e9ef am: 0f6dfca289

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

Change-Id: Ib2eb057ce132e6a162afc3e7e8e708451f942c7b