[automerger skipped] Fix issue with upgrading from previous user versions. am: f0d456b03b am: d6c19f964f -s ours am: c0b097294c -s ours

am skip reason: Merged-In I14fdac19b4458c6bd2ccee7d1b119bc710e1b600 with SHA-1 739281096a is already in history

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

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