Import updated Android SetupCompat Library 385050340 am: 8c8af5bf3a am: 1ad1bef6f3

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

Change-Id: I34ec2b75a5ca16c14e2f268561ec7ae9a06c971d