Merge "Fix issue with upgrading from previous user versions." into udc-qpr-dev am: 1a735509

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



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