Import updated Android SetupCompat Library 467157122 am: 6c88511ac5 am: 366b8eceaf

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

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