tree daa683ab0976d831ef21dcb37f22fb4d7dd46d0f
parent 73b581f0ddba2f7f7a09f976fb100f99a6b4985c
parent cb0b5e206dc3e1608949af263b5a351a17e5b58c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576084224 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576084224 +0000

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

Change-Id: Idc88718380954cd0f5fa9f3d404cc35e4a6ba7bd