Merge "Fix system reboot in systm_server caused by SensorPrivacyService" am: ffc1a30a1b am: c811169079

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

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