Changes for Car Setup Wizard Support Library: am: 15612ebde2 am: f941384091 am: eccda78bf3 am: c319e39461

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/1959684

Change-Id: I76d5916fd5aa73ddb59326d727371ecd0257dfa0