Import updated Android SetupCompat Library 387794681 am: 4098a67a63 am: c9e3073f6a

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

Change-Id: Ib8c000c836ce1b9c954014dc8b85a5bede5c5cea