Merge "[Bugfix]Avoid device reboot caused by SecurityException." into main am:...

Merge "[Bugfix]Avoid device reboot caused by SecurityException." into main am: b4838c7c am: fa555189

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



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