Partial revert of "Import updated Android SetupCompat Library 592404403"

Currently needed for our SetupWizard.

Attempt to manually revert:
- 582520278 Remove some unused suw argument extra

This partially reverts commit 4f5bbf4fcf8afa341c6198eeae5a79849f8e74e8.

Change-Id: I62ed8b87bfb436ad89560a8ed6ea9803d6c113b1
1 file changed