[automerger skipped] Merge "Clean up split system user code for device policy...

[automerger skipped] Merge "Clean up split system user code for device policy management" into sc-dev am: e7a937b0 -s ours

am skip reason: Change-Id Ibc642c04d3dcba84cd9837efb09cde04b46ff620 with SHA-1 8f9193ae is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc6537dc2a29af7bf8ef0d320e14d020d6bd1ed4