Import updated Android SetupCompat Library 371667272 am: 3a3ac684ef am: 61703d0559

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

Change-Id: I489e7db3973e9bc486a0dc53ff912e0c4318ebd7