Import updated Android SetupCompat Library 414585234 am: 03695dcf72 am: 8d5b2f2f75

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

Change-Id: Id29fa0eb495f4fb51fd5969e0518d01b88de7ca8