Import updated Android SetupCompat Library 385050340 am: 8c8af5bf3a

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

Change-Id: Id4e1181acb521aae4c8e71824f2ad8eef9ab41a6