Import updated Android SetupCompat Library 397257643 am: 46724f6727

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

Change-Id: Iddfa3992eaf23a3c24947afba88562e7e3fed2f9