Import updated Android SetupCompat Library 378593677 am: f513dd2bf8 am: f7b05bd7d4

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

Change-Id: I88009297f93717308388d608fb9c9eb5174db784