Import updated Android SetupCompat Library 470898494 am: 2bc2bf601f am: 0c20578267

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

Change-Id: I90a487fd8783c717dade46ebea391fc0c1a09622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>