[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: bda27d11 -s ours

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

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

Change-Id: I575b49b6aaafe3956ec46896d5e8cb4b3f304c4d