Import updated Android SetupCompat Library 404131397 am: 9eb31bddd3 am: dc56375967

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

Change-Id: I4c386b9636a4bf701379c2441a80178b0f67160a