Merge "Import updated Android SetupCompat Library 447928644 am: 3c778d5d37 am: ff7d0e40d0" into tm-d1-dev-plus-aosp am: 489058acfa

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

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