Snap for 9786938 from 2badd60a6afcb3fc5d8ef79aa621fbadd5ea2e8c to udc-release am: 7ab729c5c0

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

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