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

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

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