Import updated Android SetupCompat Library 373282927 am: 6a89234f6c am: 6d5279ae7e

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

Change-Id: I5e23494de3c7098174d0b33954c6e3af420f4bbb