Import updated Android SetupCompat Library 470898494 am: 2bc2bf601f

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

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