Import updated Android SetupCompat Library 354256040 am: 73b4170435 am: 64b31e5e98

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

Change-Id: I22d3788eddfbaa9ec71a0b8ded6b48d52148c0f9