Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings" am: db70de3656

Change-Id: I0a695d10ecca6134e851c0e482af7318de4fdb95