Merge "Keep enabled state across system uninstall" into sc-dev am: e3ece36d

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

Change-Id: I5b74dbbf5c41dbabf3a5236f1099b2caacec3c86