[automerger skipped] Merge "Fix uninstall system updates disabling stub for...

[automerger skipped] Merge "Fix uninstall system updates disabling stub for single user" into sc-dev am: 71d19aed am: 9afd700b -s ours

am skip reason: Merged-In I670163e01d13ee5fdd2ebc6a046fa55a5398b290 with SHA-1 6e7dced6 is already in history

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

Change-Id: I51529f22dfc945bb3519569d8283a6c1a382eac2