Merge changes from topic "am-8610f88571b243f4a251e87b3a45c870" into qt-qpr1-dev-plus-aosp

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