Import updated Android SetupCompat Library 397257643 am: 46724f6727 am: a7534ee057

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

Change-Id: If657d869253573a2d4442c3f945ddffc7028cb21