[automerger skipped] Merge "Fix issue with upgrading from previous user...

[automerger skipped] Merge "Fix issue with upgrading from previous user versions." into udc-qpr-dev am: 1a735509 am: eb036f9a -s ours

am skip reason: Merged-In I14fdac19b4458c6bd2ccee7d1b119bc710e1b600 with SHA-1 347b8a00 is already in history

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



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