Merge "Ensure TelecomServiceImpl uses System API when checking isSameApp." into main