Fix issue with upgrading from previous user versions. am: f0d456b03b

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

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