Merge "Fix system reboot in systm_server caused by SensorPrivacyService"