Import updated Android SetupCompat Library 353709689 am: 72d13daad5 am: e8251b5bac

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

Change-Id: Id23e674e3dfa8e4433f6b1ca8d4b7c3051fd3bfc