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

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

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