Merge "SystemServer: add Telephony guards"