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

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



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