Merge "Protect package-restrictions from corruption." into udc-dev am: 6a83c7e0 am: 8476d4fb

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



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