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

Change-Id: Ie169ffb10199d70036f0a4a599fe2bc72f71ed7b