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

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

Change-Id: Iec0e575384e4c69d135bbe9af0fb44b4230ce75e