Merge "Backup and restore - Fix non-system users" into tm-qpr-dev am: cb5228cf am: acdcdf68

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



Change-Id: If8701a20e313aaef51f66bb6abbd16957b3b164c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>