Merge "Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings"" into qt-qpr1-dev am: cb0b5e206d

Change-Id: Idc88718380954cd0f5fa9f3d404cc35e4a6ba7bd