[automerger skipped] Merge "UserSystemPackageInstaller only (un)installs when...
[automerger skipped] Merge "UserSystemPackageInstaller only (un)installs when appropriate" into rvc-dev am: 9968525a am: a1596923 -s ours
am skip reason: Change-Id Ia0714d1faa8f7c79082f2cc93a92ae36b9a4c918 with SHA-1 1efd27cd is in history
Change-Id: Iadc61ff1a738a799943f6b015c30ddfc25e8633a