Merge "Fix uninstall system updates disabling stub for single user" into sc-dev am: 71d19aed

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

Change-Id: Id3bb0a8a960bab3cd47b2d3f7d37a2e7f80e40ab