Merge "Fix bug in userControlDisabledPackages on reboot" into udc-dev am: 0008bee5

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



Change-Id: I8c01b9ada2b0cf8cbc7db8d7f0a78490550c452e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>