tree f7f67493628a4b865b4511109f0e486e7affdec0
parent a89b70f3b5c79ad91788c1d09552888c3f4cff0c
parent c9be18409f125123d8062d33c149a1e6cab0b390
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576084241 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1576084241 +0000

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