Import updated Android SetupCompat Library 371667272 am: 3a3ac684ef am: 840b4af764

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

Change-Id: Idd5b261dfe6359d840305dc1d145bbb169523a89