[automerger skipped] Merge "Revert "DO NOT MERGE - Add AUTOMOTIVE_USER_SETUP_IN_PROGRESS to Settings"" into qt-qpr1-dev am: cb0b5e206d am: c9be18409f -s ours
am skip reason: subject contains skip directive

Change-Id: I30ea3eb35e6b8128ffc4f2ee2ec5090c3d468990