[automerger skipped] Merge "Update PermissionManagerService to handle pre-created users" into rvc-qpr-dev am: b8f93d34ae am: 302b82c97d -s ours

am skip reason: Change-Id I52caeb3a71e560d09fcbc167b46becebf779fc3a with SHA-1 bd30f7e86a is in history

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

Change-Id: I2c9a1815841b36d7c81b88062141dc0a53916013