Merge "Clear caller identity before updating restrictions" into main am: a5d896cd29 am: 1d273f33fc

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

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