tree 87d7bf0f5cc7c90ac52c52c467a9f08e5383a7ba
parent 0915c161bcc4de0b23851badd4b6cf2340493eda
parent 17a946bc0deb84f2c22a4e44a5651046bf82f393
author Felipe Leme <felipeal@google.com> 1596688436 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596688436 +0000

Merge "Fixed how com.android.server.pm.Settings handle pre-created users." into rvc-qpr-dev am: 17a946bc0d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12308191

Change-Id: Iafbd1b80ddb0f538c09aafb5c417ad359b6abc07