Import updated Android SetupCompat Library 404131397 am: 9eb31bddd3

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

Change-Id: I8a02898ad3f310152896843bf916890e77befa00