Import updated Android SetupCompat Library 379335714 am: cdc282e9ef am: 33cf4c96e8

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

Change-Id: I0df30a05eb832281395ed0b16e2c7d452bf39d4e