Import updated Android SetupCompat Library 391898359 am: ef66c79da0 am: b54059fa29

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

Change-Id: I54e6f833ce61ea4afb76a2845e078c8c5f4e3cf6