Import updated Android SetupCompat Library 389778265 am: 8ca664e16c am: d6386b7dd6

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

Change-Id: I6b99969cdcf4a97908046851d39e3d0f55cb85e6