Merge "Import updated Android SetupCompat Library 515497412" into udc-dev am: 2badd60a6a am: b34f99c7f9

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

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