Merge "Revert "TelephonyManager: cache service handles""