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

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

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